From: Claudio Cambra Date: Thu, 27 Feb 2025 09:22:31 +0000 (+0800) Subject: gui/tray: Do not add custom styling to status message text field in user status X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~2^2~11^2~1 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success/%22http:/www.example.com/cgi/success?a=commitdiff_plain;h=284a403037ebd96f4e574ede98e0f066a01b54ba;p=nextcloud-desktop.git gui/tray: Do not add custom styling to status message text field in user status Signed-off-by: Claudio Cambra --- diff --git a/src/gui/UserStatusSelector.qml b/src/gui/UserStatusSelector.qml index 207c5206d..8967bc2f9 100644 --- a/src/gui/UserStatusSelector.qml +++ b/src/gui/UserStatusSelector.qml @@ -145,33 +145,11 @@ ColumnLayout { property color borderColor: showBorder ? Style.ncBlue : palette.dark - // We create the square with only the top-left and bottom-left rounded corners - // by overlaying different rectangles on top of each other background: Rectangle { radius: Style.slightlyRoundedButtonRadius color: palette.button border.color: fieldButton.borderColor border.width: Style.normalBorderWidth - - Rectangle { - anchors.fill: parent - anchors.leftMargin: parent.width / 2 - anchors.rightMargin: -1 - z: 1 - color: palette.button - border.color: fieldButton.borderColor - border.width: Style.normalBorderWidth - } - - Rectangle { // We need to cover the blue border of the non-radiused rectangle - anchors.fill: parent - anchors.leftMargin: parent.width / 4 - anchors.rightMargin: parent.width / 4 - anchors.topMargin: Style.normalBorderWidth - anchors.bottomMargin: Style.normalBorderWidth - z: 2 - color: palette.button - } } contentItem: Label { @@ -212,43 +190,11 @@ ColumnLayout { TextField { id: userStatusMessageTextField - property color borderColor: activeFocus ? Style.ncBlue : palette.dark - Layout.fillWidth: true - Layout.preferredHeight: contentHeight + (Style.smallSpacing * 2) - placeholderText: qsTr("What is your status?") - placeholderTextColor: palette.dark text: userStatusSelectorModel.userStatusMessage - verticalAlignment: TextInput.AlignVCenter selectByMouse: true onEditingFinished: userStatusSelectorModel.userStatusMessage = text - - background: Rectangle { - radius: Style.slightlyRoundedButtonRadius - color: palette.base - border.color: userStatusMessageTextField.borderColor - border.width: Style.normalBorderWidth - - Rectangle { - anchors.fill: parent - anchors.rightMargin: parent.width / 2 - z: 1 - color: palette.base - border.color: userStatusMessageTextField.borderColor - border.width: Style.normalBorderWidth - } - - Rectangle { // We need to cover the blue border of the non-radiused rectangle - anchors.fill: parent - anchors.leftMargin: parent.width / 4 - anchors.rightMargin: parent.width / 4 - anchors.topMargin: Style.normalBorderWidth - anchors.bottomMargin: Style.normalBorderWidth - z: 2 - color: palette.base - } - } } }